lewis hamilton and nico rosberg to renew f1 title rivalry at bahrain gp .
tensions rose in china after rosberg accused hamilton of being ` selfish '
but mercedes boss toto wolff is confident the matter has been laid to rest .
hamilton heads into the race in bahrain leading the world championship .